From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Mar 2015 01:48:47 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3375^2~193
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0dfe7002a6b6f330b981e2d40f372bf71eeac1df;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

9869d6f Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with master.
---

0dfe7002a6b6f330b981e2d40f372bf71eeac1df